bitkeeper revision 1.1159.183.51 (41bb070aDsGognVnkbq-nQ0qxDpb6w)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sat, 11 Dec 2004 14:41:14 +0000 (14:41 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sat, 11 Dec 2004 14:41:14 +0000 (14:41 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk


Trivial merge